Made DB rollback() method properly bail out if no trx is active

Change-Id: I157b3c9e7a869866c08d127cb7f9277582e1bc9e

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 7bbcc2f..4ff38c5 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3525,6 +3525,7 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
                if ( $flush !== 'flush' ) {
                        if ( !$this->mTrxLevel ) {
                                wfWarn( "$fname: No transaction to rollback, something got out of sync!" );
+                               return; // nothing to do
                        } elseif ( $this->mTrxAutomatic ) {
                                wfWarn( "$fname: Explicit rollback of implicit transaction. Something may be out of sync!" );
                        }